Merge branch 'master' of /home/wd/git/u-boot/master
authorWolfgang Denk <[email protected]>
Wed, 22 Sep 2010 20:35:44 +0000 (22:35 +0200)
committerWolfgang Denk <[email protected]>
Wed, 22 Sep 2010 20:35:44 +0000 (22:35 +0200)

Trivial merge